refactor: unify DTK5/DTK6 build system #316
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
deepin-ci-robot
added a commit
to linuxdeepin/qt6platform-plugins
that referenced
this pull request
Dec 29, 2025
Synchronize source files from linuxdeepin/qt5platform-plugins. Source-pull-request: linuxdeepin/qt5platform-plugins#316
Contributor
|
Warning
|
Contributor
|
Note
详情{
"CMakeLists.txt": [
{
"line": " HOMEPAGE_URL \"https://github.com/linuxdeepin/qt5platform-plugins\"",
"line_number": 13,
"rule": "S35",
"reason": "Url link | 508b5ed804"
}
]
} |
deepin-ci-robot
added a commit
to linuxdeepin/qt6platform-plugins
that referenced
this pull request
Dec 30, 2025
Synchronize source files from linuxdeepin/qt5platform-plugins. Source-pull-request: linuxdeepin/qt5platform-plugins#316
Contributor
|
Warning
|
Contributor
|
Note
详情{
"CMakeLists.txt": [
{
"line": " HOMEPAGE_URL \"https://github.com/linuxdeepin/qt5platform-plugins\"",
"line_number": 13,
"rule": "S35",
"reason": "Url link | 508b5ed804"
}
]
} |
deepin-ci-robot
added a commit
to linuxdeepin/qt6platform-plugins
that referenced
this pull request
Dec 30, 2025
Synchronize source files from linuxdeepin/qt5platform-plugins. Source-pull-request: linuxdeepin/qt5platform-plugins#316
Contributor
|
Warning
|
Contributor
|
Note
详情{
"CMakeLists.txt": [
{
"line": " HOMEPAGE_URL \"https://github.com/linuxdeepin/qt5platform-plugins\"",
"line_number": 13,
"rule": "S35",
"reason": "Url link | 508b5ed804"
}
]
} |
mhduiy
previously approved these changes
Dec 31, 2025
deepin-ci-robot
added a commit
to linuxdeepin/qt6platform-plugins
that referenced
this pull request
Dec 31, 2025
Synchronize source files from linuxdeepin/qt5platform-plugins. Source-pull-request: linuxdeepin/qt5platform-plugins#316
Contributor
|
Warning
|
Contributor
|
Note
详情{
"CMakeLists.txt": [
{
"line": " HOMEPAGE_URL \"https://github.com/linuxdeepin/qt5platform-plugins\"",
"line_number": 13,
"rule": "S35",
"reason": "Url link | 508b5ed804"
}
],
"archlinux/PKGBUILD": [
{
"line": "url=\"https://github.com/linuxdeepin/qt5platform-plugins\"",
"line_number": 10,
"rule": "S35",
"reason": "Url link | 508b5ed804"
}
]
} |
asterwyx
reviewed
Jan 6, 2026
| qtbase5-private-dev <!nodtk5>, | ||
| libqt5x11extras5-dev <!nodtk5>, | ||
| libqt5opengl5-dev <!nodtk5>, | ||
| qtwayland5-private-dev | libqt5waylandclient5-dev <!nodtk5>, |
1. Replaced PROJECT_VERSION_MAJOR-based Qt version detection with explicit DTK5/DTK6 build option 2. Added DTK5 CMake option (default ON) to control DTK5 vs DTK6 builds 3. Updated DTK_VERSION calculation to use DTK_VERSION_MAJOR from build option instead of PROJECT_VERSION_MAJOR 4. Modified CMake logic to conditionally build wayland plugin only for DTK5 builds 5. Restructured debian/control to support both DTK5 and DTK6 packages with Build-Profiles 6. Added new dde-qt6xcb-plugin package for DTK6 builds 7. Implemented separate build directories (build-dtk5, build-dtk6) in debian/rules for parallel builds 8. Added build profile support (nodtk5, nodtk6) to control which packages are built 9. Updated package descriptions to clearly indicate DTK5/Qt5 vs DTK6/ Qt6 versions Log: Updated build system to support both DTK5 and DTK6 versions Influence: 1. Test building with default settings (DTK5=ON) to ensure DTK5 builds work 2. Test building with DTK5=OFF to verify DTK6 builds work correctly 3. Verify that wayland plugin is only built for DTK5 builds 4. Test package generation with different build profiles (nodtk5, nodtk6) 5. Verify that both dde-qt5xcb-plugin and dde-qt6xcb-plugin packages are created correctly 6. Test installation of both DTK5 and DTK6 packages on appropriate systems 7. Verify plugin paths are correct (Qt5 vs Qt6 plugin directories) refactor: 统一DTK5/DTK6构建系统 1. 将基于PROJECT_VERSION_MAJOR的Qt版本检测改为显式的DTK5/DTK6构建选项 2. 添加DTK5 CMake选项（默认开启）来控制DTK5与DTK6构建 3. 更新DTK_VERSION计算，使用构建选项中的DTK_VERSION_MAJOR而非 PROJECT_VERSION_MAJOR 4. 修改CMake逻辑，仅对DTK5构建有条件地构建wayland插件 5. 重构debian/control以支持带有Build-Profiles的DTK5和DTK6包 6. 为DTK6构建添加新的dde-qt6xcb-plugin包 7. 在debian/rules中实现独立的构建目录（build-dtk5, build-dtk6）用于并行 构建 8. 添加构建配置文件支持（nodtk5, nodtk6）来控制构建哪些包 9. 更新包描述以清晰标明DTK5/Qt5与DTK6/Qt6版本 Log: 更新构建系统以支持DTK5和DTK6版本 Influence: 1. 使用默认设置（DTK5=ON）测试构建，确保DTK5构建正常工作 2. 使用DTK5=OFF测试构建，验证DTK6构建正确工作 3. 验证wayland插件仅对DTK5构建进行构建 4. 使用不同的构建配置文件（nodtk5, nodtk6）测试包生成 5. 验证dde-qt5xcb-plugin和dde-qt6xcb-plugin包都正确创建 6. 在适当的系统上测试DTK5和DTK6包的安装 7. 验证插件路径正确（Qt5与Qt6插件目录）
deepin-ci-robot
added a commit
to linuxdeepin/qt6platform-plugins
that referenced
this pull request
Jan 6, 2026
Synchronize source files from linuxdeepin/qt5platform-plugins. Source-pull-request: linuxdeepin/qt5platform-plugins#316
Contributor
|
Warning
|
Contributor
deepin pr auto review我来对这个diff进行代码审查：
语法逻辑：
代码质量：
代码性能：
代码安全：
语法逻辑：
代码质量：
语法逻辑：
代码质量：
语法逻辑：
代码质量：
语法逻辑：
代码质量：
总体建议：
这些改动整体上提高了代码的可维护性和灵活性，特别是在支持DTK5和DTK6双版本构建方面做得很好。 |
Contributor
|
Note
详情{
"CMakeLists.txt": [
{
"line": " HOMEPAGE_URL \"https://github.com/linuxdeepin/qt5platform-plugins\"",
"line_number": 13,
"rule": "S35",
"reason": "Url link | 508b5ed804"
}
],
"archlinux/PKGBUILD": [
{
"line": "url=\"https://github.com/linuxdeepin/qt5platform-plugins\"",
"line_number": 10,
"rule": "S35",
"reason": "Url link | 508b5ed804"
}
]
} |
mhduiy
approved these changes
Jan 6, 2026
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 18202781743, mhduiy The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
explicit DTK5/DTK6 build option
option instead of PROJECT_VERSION_MAJOR
DTK5 builds
with Build-Profiles
debian/rules for parallel builds
packages are built
Qt6 versions
Log: Updated build system to support both DTK5 and DTK6 versions
Influence:
work
nodtk6)
created correctly
systems
refactor: 统一DTK5/DTK6构建系统
PROJECT_VERSION_MAJOR
构建
Log: 更新构建系统以支持DTK5和DTK6版本
Influence: